From: djm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Date: Wed, 14 Sep 2005 21:36:10 +0000 (-0600)
Subject: Merge latest xen-unstable into xen-ia64-unstable to prep
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16806
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6be63db55dbb1b1e5f8e0395d65de82d60f5f56a;p=xen.git

Merge latest xen-unstable into xen-ia64-unstable to prep
for push back to xen-unstable
---

6be63db55dbb1b1e5f8e0395d65de82d60f5f56a
diff --cc linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
index 5d1e38564e,f2eb0036e5..d1853322e9
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
@@@ -45,9 -45,8 +45,9 @@@
  #include <linux/blkdev.h>
  #include <linux/major.h>
  #include <linux/devfs_fs_kernel.h>
- #include <asm-xen/hypervisor.h>
+ #include <asm/hypervisor.h>
  #include <asm-xen/xenbus.h>
 +#include <asm-xen/gnttab.h>
  #include <asm-xen/xen-public/xen.h>
  #include <asm-xen/xen-public/io/blkif.h>
  #include <asm-xen/xen-public/io/ring.h>
diff --cc linux-2.6-xen-sparse/drivers/xen/console/console.c
index 087891ee4d,1091c6f903..f05d06136d
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c
@@@ -49,9 -49,8 +49,9 @@@
  #include <asm/io.h>
  #include <asm/irq.h>
  #include <asm/uaccess.h>
 +#include <asm-xen/xen-public/xen.h>
  #include <asm-xen/xen-public/event_channel.h>
- #include <asm-xen/hypervisor.h>
+ #include <asm/hypervisor.h>
  #include <asm-xen/evtchn.h>
  
  #include "xencons_ring.h"
diff --cc tools/examples/xen-backend.agent
index 91a5d0eb32,91a5d0eb32..6aefea1399
--- a/tools/examples/xen-backend.agent
+++ b/tools/examples/xen-backend.agent
@@@ -1,3 -1,3 +1,7 @@@
++

++copyrev: 0000000000000000000000000000000000000000
++copy: tools/examples/backend.hotplug
++

  #! /bin/sh
  
  #ACTION=add